resolve conflicts

• How to : resolve conflicts in system definition model documents visual studio team system
  >如何：解决系统定义模型( sdm )文档中的冲突
• In the resolve conflicts dialog box , select the files that you want and click
  在“解决冲突”对话框中选择所需的文件并单击“解决” 。
• Describes how to resolve conflicts during a merge , pending change , or get operation
  描述如何解决合并、挂起更改或获取操作过程中的冲突。
• Walkthrough : resolving conflicting changes in microsoft excel or microsoft project
  演练：解决microsoft excel或microsoft project中发生冲突的更改
• If you need to resolve conflicts in . sdm files , first choose to merge them automatically
  如果需要解决. sdm文件中的冲突，首先应选择自动合并文件。
• If conflicts between these files still exist , the resolve conflicts dialog box appears
  如果这些文件之间的冲突仍然存在，则会出现“解决冲突”对话框。
• We should resolve conflicts peacefully , as a shining example for our children ' s sake
  我们应该和平解决冲突，为了我们孩子们的好，我们应当作出一个好的榜样。
• Identify and resolve conflicts that may result when resources are assigned to more than one project
  当资源被分配给多个项目时，识别和解决由此引起的冲突。
• Even when our tone is measured and moderate , self - centered talk does not resolve conflicts
  甚至当我们的音调是规则的和缓和的，独立自主的发言，而不解决冲突。
• Returns the clsid value of a com component that is registered as a business logic module used to resolve conflicts
  返回com组件的clsid值，该组件注册为用于解决冲突的业务逻辑模块。